From 81667d0511f1c95ac4922031808134985ce2d121 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Thu, 1 Sep 2005 09:01:15 +0000 Subject: [PATCH] VTPM is off by default. --- Config.mk | 1 + linux-2.6-xen-sparse/arch/xen/Kconfig | 2 +- .../arch/xen/configs/xen0_defconfig_x86_32 | 7 ++----- .../arch/xen/configs/xen0_defconfig_x86_64 | 7 ++----- .../arch/xen/configs/xenU_defconfig_x86_32 | 5 ++--- .../arch/xen/configs/xenU_defconfig_x86_64 | 3 +-- .../arch/xen/configs/xen_defconfig_x86_32 | 9 +++------ .../arch/xen/configs/xen_defconfig_x86_64 | 4 ++-- tools/Makefile | 2 ++ 9 files changed, 16 insertions(+), 24 deletions(-) diff --git a/Config.mk b/Config.mk index 06d569851c..e5f53cbc16 100644 --- a/Config.mk +++ b/Config.mk @@ -48,3 +48,4 @@ ACM_USE_SECURITY_POLICY ?= ACM_NULL_POLICY # Optional components XENSTAT_XENTOP ?= y +VTPM_TOOLS ?= n diff --git a/linux-2.6-xen-sparse/arch/xen/Kconfig b/linux-2.6-xen-sparse/arch/xen/Kconfig index e0c76d476a..b5088f87a8 100644 --- a/linux-2.6-xen-sparse/arch/xen/Kconfig +++ b/linux-2.6-xen-sparse/arch/xen/Kconfig @@ -72,7 +72,7 @@ config XEN_NETDEV_BACKEND config XEN_TPMDEV_FRONTEND bool "TPM-device frontend driver" - default y + default n help The TPM-device frontend driver. diff --git a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 index 813ebf24ee..a6c238b134 100644 --- a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 @@ -16,8 +16,7 @@ CONFIG_XEN_BLKDEV_BACKEND=y # CONFIG_XEN_BLKDEV_TAP_BE is not set CONFIG_XEN_NETDEV_BACKEND=y # CONFIG_XEN_TPMDEV_FRONTEND is not set -CONFIG_XEN_TPMDEV_BACKEND=y -# CONFIG_XEN_TPMDEV_CLOSE_IF_VTPM_FAILS is not set +# CONFIG_XEN_TPMDEV_BACKEND is not set CONFIG_XEN_BLKDEV_FRONTEND=y CONFIG_XEN_NETDEV_FRONTEND=y CONFIG_XEN_NETDEV_GRANT_TX=y @@ -855,9 +854,7 @@ CONFIG_DRM_SIS=m # # TPM devices # -CONFIG_TCG_TPM=m -CONFIG_TCG_NSC=m -CONFIG_TCG_ATMEL=m +# CONFIG_TCG_TPM is not set # # I2C support diff --git a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64 b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64 index a0aedc4e38..47d1ea9218 100644 --- a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64 @@ -15,9 +15,8 @@ CONFIG_XEN_PHYSDEV_ACCESS=y CONFIG_XEN_BLKDEV_BACKEND=y # CONFIG_XEN_BLKDEV_TAP_BE is not set CONFIG_XEN_NETDEV_BACKEND=y -# CONFIG_XEN_TPMDEV_BACKEND is not set # CONFIG_XEN_TPMDEV_FRONTEND is not set -# CONFIG_XEN_TPMDEV_CLOSE_IF_VTPM_FAILS is not set +# CONFIG_XEN_TPMDEV_BACKEND is not set CONFIG_XEN_BLKDEV_FRONTEND=y CONFIG_XEN_NETDEV_FRONTEND=y CONFIG_XEN_NETDEV_GRANT_TX=y @@ -762,9 +761,7 @@ CONFIG_DRM_SIS=m # # TPM devices # -CONFIG_TCG_TPM=m -CONFIG_TCG_NSC=m -CONFIG_TCG_ATMEL=m +# CONFIG_TCG_TPM is not set # # I2C support diff --git a/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 b/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 index bc7bc1bbdf..492b6d6cea 100644 --- a/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 @@ -12,7 +12,7 @@ CONFIG_NO_IDLE_HZ=y # # CONFIG_XEN_PRIVILEGED_GUEST is not set # CONFIG_XEN_PHYSDEV_ACCESS is not set -CONFIG_XEN_TPMDEV_FRONTEND=y +# CONFIG_XEN_TPMDEV_FRONTEND is not set # CONFIG_XEN_TPMDEV_BACKEND is not set CONFIG_XEN_BLKDEV_FRONTEND=y CONFIG_XEN_NETDEV_FRONTEND=y @@ -338,8 +338,7 @@ CONFIG_NETDEVICES=y CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 -CONFIG_TCG_TPM=y -CONFIG_TCG_XEN=y +# CONFIG_TCG_TPM is not set # # Character devices diff --git a/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64 b/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64 index d3fff5d91b..2e4ddbcba8 100644 --- a/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64 @@ -664,8 +664,7 @@ CONFIG_NETCONSOLE=m CONFIG_INPUT=m CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set -CONFIG_TCG_TPM=y -CONFIG_TCG_XEN=y +# CONFIG_TCG_TPM is not set # # Character devices diff --git a/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_32 b/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_32 index c00ca74c40..56fa2258de 100644 --- a/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_32 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_32 @@ -15,11 +15,10 @@ CONFIG_XEN_PHYSDEV_ACCESS=y CONFIG_XEN_BLKDEV_BACKEND=y # CONFIG_XEN_BLKDEV_TAP_BE is not set CONFIG_XEN_NETDEV_BACKEND=y -CONFIG_XEN_TPMDEV_BACKEND=y -# CONFIG_XEN_TPMDEV_CLOSE_IF_VTPM_FAILS is not set +# CONFIG_XEN_TPMDEV_FRONTEND is not set +# CONFIG_XEN_TPMDEV_BACKEND is not set CONFIG_XEN_BLKDEV_FRONTEND=y CONFIG_XEN_NETDEV_FRONTEND=y -CONFIG_XEN_TPMDEV_FRONTEND=y CONFIG_XEN_NETDEV_GRANT_TX=y CONFIG_XEN_NETDEV_GRANT_RX=y # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set @@ -1858,9 +1857,7 @@ CONFIG_HANGCHECK_TIMER=m # # TPM devices # -CONFIG_TCG_TPM=m -CONFIG_TCG_NSC=m -CONFIG_TCG_ATMEL=m +# CONFIG_TCG_TPM is not set # # I2C support diff --git a/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_64 b/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_64 index 9ec1066eed..420365ef0b 100644 --- a/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_64 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_64 @@ -15,10 +15,10 @@ CONFIG_XEN_PHYSDEV_ACCESS=y CONFIG_XEN_BLKDEV_BACKEND=y # CONFIG_XEN_BLKDEV_TAP_BE is not set CONFIG_XEN_NETDEV_BACKEND=y -# CONFIG_XEN_TPMEV_BACKEND is not set +# CONFIG_XEN_TPMDEV_FRONTEND is not set +# CONFIG_XEN_TPMDEV_BACKEND is not set CONFIG_XEN_BLKDEV_FRONTEND=y CONFIG_XEN_NETDEV_FRONTEND=y -# CONFIG_XEN_TPMDEV_FRONTEND is not set CONFIG_XEN_NETDEV_GRANT_TX=y CONFIG_XEN_NETDEV_GRANT_RX=y # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set diff --git a/tools/Makefile b/tools/Makefile index 1ed976476d..d2ba0874ee 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -12,8 +12,10 @@ SUBDIRS += xcutils SUBDIRS += firmware SUBDIRS += security SUBDIRS += console +ifeq ($(VTPM_TOOLS),y) SUBDIRS += vtpm_manager SUBDIRS += vtpm +endif SUBDIRS += xenstat .PHONY: all install clean check check_clean ioemu eioemuinstall ioemuclean -- 2.30.2